fix(token): deduplicate composite-owner inputs whose token IDs are filtered out - #2241
fix(token): deduplicate composite-owner inputs whose token IDs are filtered out#2241EvanYan1024 wants to merge 1 commit into
Conversation
|
Hello @EvanYan1024, Thanks a lot for submitting the PR. The fix looks correct to me. When a wallet is shared by two members, spending a token produces one row per member, which is then deduplicated so the token is counted only once. The problem was that the auditor receives metadata with token IDs stripped for privacy, so every row had Id == nil and deduplication failed, causing a 40-token spend to be counted as -80. The fix adds a position (action index + input index) to each input and uses it as the fallback identifier when the token ID is missing. Since both member rows for the same token share the same position, they are correctly collapsed to -40. Other cases remain unaffected. One minor concern: Index defaults to 0, so a future caller that forgets to set it could cause silent incorrect deduplication. I am wondering, would it be worth adding a constructor that requires Index? What do you think on this? Regards, |
|
@AkramBitar Good catch. A constructor alone would not enforce this while
If that works for you, I'll push it. |
Thanks a lot. Works for me push it. Regards, |
7da7e37 to
27941e9
Compare
|
@AkramBitar Pushed in |
8fad044 to
9bbcbb6
Compare
9bbcbb6 to
d7e450d
Compare
|
Thanks a lot for working on this PR. Ready to merge it could you please rebase and squash the commits to one? Regards, |
…ltered out UniquePerInput deduplicates by (token ID, enrollment ID) and keeps every input with a nil token ID. Metadata.filterTransfer strips TokenID from the input metadata it clones, so consumers of eID-filtered metadata get nil token IDs and composite-owner member rows are summed once per member again. Give Input an Index, its position within the action, and fall back to (action index, input index, enrollment ID) as the deduplication key when the token ID is absent. Positions survive filtering because filterTransfer emits one entry per input. Inputs carrying a token ID keep the previous key, so existing callers are unaffected. Index defaults to 0, so two literal-built inputs with no token ID would silently collapse on a position nobody set. NewInput becomes the canonical way to build an input and stamps an unexported position-known marker; UniquePerInput collapses on position only for marked inputs, while literal-built inputs keep the previous keep-all behavior, locked by a regression test. Signed-off-by: Evan <evanyan@sign.global>
d7e450d to
4f88680
Compare
|
@AkramBitar Done — rebased onto main and squashed into a single commit ( |
2 participants
Problem
InputStream.UniquePerInput()(#2148) deduplicates the member rows of a composite-owner input by(token ID, enrollment ID)and keeps every input whose token ID is nil. ButMetadata.filterTransferclones onlySendersand neverTokenID, andttxmarshals that eID-filtered copy for each counterparty — so on those consumers everyInputcarriesId == nil, the deduplication no-ops, and a composite owner's spend is summed once per member again: 40 spent from a two-member wallet sharing an enrollment ID lands as -80 in that party's movements.Fixes #2240
Fix
The filtering is position-preserving —
filterTransferemits one (possibly empty) entry per input andRequest.extractTransferInputswalks them by index — so the input's position survives filtering and no driver/metadata wire change is needed.token/stream.go—InputgainsIndex, its position within the action, mirroring the role ofOutput.Index.UniquePerInputkeys on(token ID, enrollment ID)when the token ID is present — unchanged behavior for existing callers, including those that constructInputdirectly and never setIndex— and falls back to(action index, input index, enrollment ID)when it has been filtered out. The two key spaces cannot mix:filterIssuekeepsInputsverbatim (token IDs included), so only transfer inputs ever lose their token ID, and the per-type action index is unique among transfers.token/request.go—extractTransferInputs/extractIssueInputsrecord the position.token/stream_test.go— contract tests for both key spaces: member rows with a filtered-out token ID now collapse, distinct token IDs at equal positions stay distinct, and a row with a token ID never collides with a positionally identical row without one.docs/services/storage/ttxdb.md— documents the fallback.Testing
go build,go vet,go test -race ./token/..., and golangci-lint v2.12.2 with the repo config, all clean locally.